Merge fix for Bug#8879 from trunk
authorChong Yidong <cyd@stupidchicken.com>
Sat, 18 Jun 2011 19:23:54 +0000 (15:23 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 18 Jun 2011 19:23:54 +0000 (15:23 -0400)

Trivial merge